Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing latest changes from upstream main for ramen #351

Merged
merged 3 commits into from
Sep 11, 2024
Merged

Conversation

df-build-team
Copy link

PR containing the latest commits from upstream main branch

ELENAGER and others added 3 commits September 10, 2024 09:55
Signed-off-by: Elena Gershkovich <elenage@il.ibm.com>
In newer controller-runtime version 0.19.0 the check for unique controller names.
In our tests we are registering the same controller (drcluster controller) several times - in
suite_test and in drcluster_mmode_test and in drcluster_drcconfig_tests. As a temporaty solution
I added a flag for skipping the unique controller name validation. Another solution can be
adding a name as a parameter for SetupWithManager function.

Signed-off-by: Elena Gershkovich <elenage@il.ibm.com>
The issue where the "velero.io/exclude-from-backup" label was not applied
originates from our deployment workflow. Initially, we deploy the workload,
followed by enabling DR. During the first deployment, the Placement Operator
creates the "PlacementDecision" with default labels. However, when "Ramen" tries
to add the "velero.io/exclude-from-backup" label during DR setup, it skips because
the "PlacementDecision" already exists. Consequently, "Velero" backs up the
"PlacementDecision". And during hub recovery, it is restored without its status,
leading to the unintended deletion of the workload. This situation only occurs
when the current state wasn't updated before hub recovery was applied.

The fix in this PR does not address the scenario where the workload is deployed,
a hub backup is taken, DR is enabled, and then the hub is recovered before another
backup is created.

Fixes bug: 2308801

Signed-off-by: Benamar Mekhissi <bmekhiss@ibm.com>
@df-build-team df-build-team requested a review from a team September 11, 2024 08:01
Copy link

openshift-ci bot commented Sep 11, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: df-build-team

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ShyamsundarR ShyamsundarR merged commit b8cb3ee into main Sep 11, 2024
37 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants